0000000000000000000000000000000000000000 3d26aa8aac305e66c98c0bf69f08a5b24b266b33 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1344371205 -0500	branch: Created from master
3d26aa8aac305e66c98c0bf69f08a5b24b266b33 0070f9c9995d21727383d01e3a810f886dceb46f Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1344371414 -0500	commit: Initial commit of Joystick v1. This application loads a view controller and then the joystick scene from the view controller. The next step is to add the WiRC functionality to the view controller and attempt not to break anything!
0070f9c9995d21727383d01e3a810f886dceb46f a0e23303f7561b46078cad51ad6a70a46cfa568f Amber Walker <AMWalker@walkers-time-capsule.(none)> 1344458789 -0500	commit: Added all WiRC functionality but have not yet made connections in nib file. All MATH files were removed, as Spinor.h was causing compiler errors when combined with the cocos2d libraries. Luckily, for the joystick application we do not need MATH, as it pertains almost exclusively to Quaternions.
a0e23303f7561b46078cad51ad6a70a46cfa568f 37809b1c27c4585f1537bb43a5773027e8a29cfa Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1348766536 -0500	commit: This is Joystick v1 restored to its ORIGINAL WORKING configuration. I have not yet made the additions in this version for connection status and re-connect alertView; however, all functionality is there with the WiRC, and most convertToPWM values should be on target.
37809b1c27c4585f1537bb43a5773027e8a29cfa f819ae678f754793465ad0c9b46a882863d24690 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1348772148 -0500	commit: Added Tilt + Joy v2 target to combine functionality. Need to find the appropriate build settings to overcome the issues with the Quaternion.h package; otherwise it is ready for its first build. Will need to extensively test the camera function via joystick, as controls are mapped from tilt controls which may not be appropriate based on axes.
f819ae678f754793465ad0c9b46a882863d24690 bd703c4601960dd0998a353e9b4daa85d8e8e8c7 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349285540 -0500	commit: Current version is running and both joystick and deadman switch are active. Joystick currently hidden by camera placeholder. Will have to figure out how to make UIView and CCScene play nice. Also, scaling of camera inputs needs to be done and references to stopMotion need to be checked for bugs.
bd703c4601960dd0998a353e9b4daa85d8e8e8c7 e8f1628be5c632601126fd151da5d8c9e02eb760 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349822004 -0500	commit: Attempting to change CCScene to CCGLView to play nice with .xib file. Had it working, now it's not!!!
e8f1628be5c632601126fd151da5d8c9e02eb760 cbbe8522e53c997b4ed6afa81180c9efa386aa41 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349823201 -0500	commit: CCGLView with joystick sprite load over UIView with cameraImg and other buttons/outputs. Currently in landscape mode; will have to determine if leaving that is feasible. No way so far to make Director, CCScene, and Layer all transparent, so must choose layout such that joystick does not affect view.
cbbe8522e53c997b4ed6afa81180c9efa386aa41 194c4484fa8c8ec2528002c646fbc6d3e5436549 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349879016 -0500	commit: Working joystick with appropriate placement. Working to make view behind it circular; however, if that doesn't work we'll just move some of the buttons/displays around to make the display more appropriate.
194c4484fa8c8ec2528002c646fbc6d3e5436549 216e8cb9447223b03359e31c36683148f09c79ec Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1349890279 -0500	commit: Updates made to potentially permit camera feed as a CCSprite behind joystick by writing camera image to file and presenting it with the update(ccTime): method in InputLayer.mm. If that doesn't work, we'll go back to a UIImageView.
216e8cb9447223b03359e31c36683148f09c79ec 0bc01d5f6df110b6637976ddb286a3fb348e1e40 Amber Walker <AMWalker@ip-10-195-120-120.wireless-wmc.nor.ou.edu> 1349906336 -0500	commit: Camera is feeding in as layer behind joystick (YEAH)! Needs tested on device in case file path is different than on simulator. New icon and splash screen are included, and troubleshooting needs to take place for screenShot, as well as a decision needing made for whether to alert user to picture saved status.
0bc01d5f6df110b6637976ddb286a3fb348e1e40 b625b436ea28623f015177805d86e12db686b2d7 Amber Walker <AMWalker@ip-10-195-120-120.wireless-wmc.nor.ou.edu> 1349982942 -0500	commit: Working copy ready for Phase 2. Left transparent gray bar along bottom where joystick and tilt controls are located. Fixed issues with motion NOT stopping during a disconnect. Confirmed camera and vehicle move as expected with NO simultaneous control.
b625b436ea28623f015177805d86e12db686b2d7 8245771b158259fd7e089965849e11145d104535 Amber Walker <AMWalker@ip-10-195-120-120.wireless-wmc.nor.ou.edu> 1349984449 -0500	commit: Confirmed [stopMotion] called upon disconnect and moved some NSLog functions to clean up the console.
8245771b158259fd7e089965849e11145d104535 04ce2bf3c42e7c7457ad46d5612b59caf56b4009 Amber Walker <AMWalker@amber-walkers-macbook-pro.local> 1350270001 -0500	commit: Completed checks of dual control and added instructions for when those controls ARE activated simultaneously. This requires brief testing but is otherwise ready for Phase 2.
04ce2bf3c42e7c7457ad46d5612b59caf56b4009 a5a7469825cb896cd99d4737af3e9b9d9d6bceb3 Amber Walker <AMWalker@ip-10-195-105-242.wireless-wmc.nor.ou.edu> 1350512056 -0500	commit: Fixed small issue with screenshot button highlight. Also fixed spacing in entry instructions.
a5a7469825cb896cd99d4737af3e9b9d9d6bceb3 54c7b5123cd33b0241d9413f63fd2ec8c73f7763 Amber Walker <AMWalker@ip-10-195-125-122.wireless-wmc.nor.ou.edu> 1351266458 -0500	commit: Attempting to build new Custom v3 controller. Having some issues with classes of the same name from previous projects.
54c7b5123cd33b0241d9413f63fd2ec8c73f7763 a6d3f2c04431fcfb82a14e7e83171891c75ac7e4 Amber Walker <AMWalker@ip-10-195-125-122.wireless-wmc.nor.ou.edu> 1351266488 -0500	commit: Building plist for in app settings kit.
a6d3f2c04431fcfb82a14e7e83171891c75ac7e4 d03aa3eb316fbff3a171371fdfdc24fd9b144ad2 Amber Walker <AMWalker@walkers-time-capsule.gateway.2wire.net> 1351824223 -0500	commit: Changes to these files are less important but necessary for compiling. Root.plist is the settings bundle read in by IASK.
